From: Alan Mackenzie <acm@muc.de>
Date: Thu, 3 Dec 2009 15:56:29 +0000 (+0000)
Subject: Correct conflicts in previous patch.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~9107
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1ba69ed9829e10ffc9cde75308938a03918b3ece;p=emacs.git

Correct conflicts in previous patch.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d1c01ebe1fb..d8e08eb3258 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -927,14 +927,6 @@ Enhance `c-parse-state' to run efficiently in "brace desserts".
 	* progmodes/cc-menus.el (cc-imenu-java-generic-expression):
 	Correct the patch from 2009-11-18.  (Bug#3910)
 
-<<<<<<< ChangeLog
-=======
-2009-11-21  Alan Mackenzie  <acm@muc.de>
-
-	* progmodes/cc-menus.el (cc-imenu-java-generic-expression):
-	Update to deal with modern Java constructs.
-
->>>>>>> 1.16811
 2009-11-21  Tassilo Horn  <tassilo@member.fsf.org>
 
 	* progmodes/subword.el: Rename from lisp/subword.el.